dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 32b46fc 3980903)

author	Paul Eggert <eggert@cs.ucla.edu>
	Wed, 7 Dec 2016 20:40:43 +0000 (12:40 -0800)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Wed, 7 Dec 2016 20:40:43 +0000 (12:40 -0800)
commit	c5532f5a5c304134ecb0367997402c2935d6030c
tree	cff0c6b05099fcaa51dae8e1c042528cdb318925	tree \| snapshot
parent	32b46fc82f1275d8e0c86340546db366dea48c8c	commit \| diff
parent	39809036d39711fb5d01105739dd301ac046b151	commit \| diff

Merge from origin/emacs-25

3980903 ; Update ChangeLog.2, etc/AUTHORS and ldef-boot.el for Emacs ...
5878abf Fix 'expand-file-name' during startup on MS-Windows

ChangeLog.2	diff1 \|	diff2 \|	blob \| history
doc/lispref/files.texi	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/international/mule-cmds.el	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/w32.c	diff1 \|	diff2 \|	blob \| history
src/w32.h	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.